Adding stuff I forgot in last commit :)