Removed duplicate callbacks and changed method names