Added the makeunique function back in