updated, refactored
first commit