changed order to force watch to run last