I screwed up a bit this morning, so I have to correct my mistakes