Added stuff that missed the last commit