changed order, added schedule