Basic code Update 2