Updated legacy version