Updated tank placement and barrel offsetting