Add old functionality to merge later