Variant updates

Finally I managed a way to create pull-request based on your latest code.
Here is an update to get your variants up to date...