Finished updated 19