Updated hander code to use new functions.