updates, fix offset issue