Removing old code and add new codes