Changes as suggested