final fix

Finally, made it all compatible.