Windsor added with few adjustments.