A lot of changes, implented a lot of features