making some enchancements