Mbriskar windup 336

Another try (DO NOT MERGE)