Fixing shadow
merging lastest changes