moved all the old stuffs and added new stuffs