updated remaining handlers.