Cut out old code from Add