Reworked scheduling a bit to break dependencies