Added some major updates