pre branch
rewriting for vector layer handling