adding changes baeed on Kavinga's feedback