Added Kay's change