all changes on 11 - 08