Improvements 06/02/1013