Fixing update handler; handler is now updated