cleaned up for merge