enhancements (allmost done)