A couple of changes, I'll wait until I understand foundation a bit more