updates after vladimir's bug fix