Updated in preparation for finalizing code