Added some things that were missed out