isseu #1 resolved
final enhancements