Refining/fixing new handler methods.