Seems to work. Above the equator. Also some housekeeping
fix conflict