Updates of main class  up to Point 8