Updated with text selection