Adding stuff that I missed in last update