A lot of stuff was changed and added