Final code changes - ASDI Week1