Addition al enhancements