Updated to use the new seprate quarrylogic