deleted
refactored some bits