Done some Changes - FINISHED