removed dependency on recordtype