some enchancements