updated everything
removed something and added some other things