fixed misplaced helper methods