restructured logic with further logic improvements

restructured logic with further logic improvements #2