refactored for 0.2
deleting old stuff