Changed persistence to rr4dj
Comment out weather for now
merge