minor modifications to types