further changes to handlers