cleaned up and fixed winfield