Move more inline (don't hate me)