Yesterday
merge from fogmethod1 (sky branch)