Added check for Winders