Feature/add 32