Fixed: CS
Refactored: droplet actions