Moved some stuff around for better pull