! improving structure and handler architecture