Zombie class refacotring
Merge branch 'issue2'