updated to do; finalizing