Correcting Subs to new version