Updated class plan