Bringing in changes on 7/7