improvements 06/07