Complete Raindrops revision 2