changes: geometry class, task class