Comment probably needs to be removed