Changed watch to support output directory