added fog
merge