updated for class project