Added new handlers
Removed some stuff