some enhancements (part2)