Updated with fog and more chnages to product