Made a few updates and made more like previous