Final code changes2 - ASDI Week1