Fixing up contracts v3