Changed helper method