fixed pre-reworked version
removed unnecessary Empty class