Added stuff I missed