Feature/make ready for visensor