augment handler. Cleaning up