More efficient to use the handler
release 1.0