Updated for night conditions and to simplify