reverted to previous helper method