Updated CSC336 and CSC384