rewrote without fog

Change-Id: I7ced41cfdd4a2fc758b80712410bb5acf3daabc0