refactored
refactored some more intros