Improvements after client revision