some enhancements...