Improvements after feedback