working, commnets removed
minor modifications