Work on new versions also