Added some extra stuff from online