Watch for changes are rebuild... finally