Woo better assert! :D
Woo better assert! And slight function reorder to make more sense