Updated to csc220