Updated Solar Calculator