some enhancements;