some enhancements!