FINAL UPGRADE