Added some features, made changes too