Started to add code for amendment handling