cleaned up overlap