Replaced after exam issues

fixed