Change: add offset and length