Updated Basics Class