Final changes as per suggestions