fixed data -> body rename
aah in error checking as well
checking length only if defined