Added -j and moved some stuff around