offline enhancements