Feature/vov 1995

This is actually for feature 1995 and 1994