better sun context spot

...lots of small changes in a row here