Deal with shadows better