Raindrops work
Merge fixes