Improve further re work