EMMA-25: added velocity conditions