changed method names to camelcase