Third commit, removed the weird things.