Updated prep. & added basics