Feature/add 2 1 0