continued work towards supporting diablodrops