close to fixing scheduling - meh