helper methods added - other classes changed