morning changes, still not complete