took out merged stuff