Draft: fixes in offset