update and drop version 2 compatibility