Changes done - Final