enhancements #532