17 April changes by shahzeb