Started to implement post-amendment handling