Adding enhancements by janosh.