adding suncalc
refactor a little