Feature/vov 1638 derivative location