change name and helper methods