Add SunShade + some fix