functionality enhancements
..