17 Apr changes