Didn't change a lot, a bit more code