don't actually rememeber what I changed in here. Probably the order to make it more intuitive