This needs to be removed from process