final update before revamp