Merge with current code in blessed