probably broke some things
build assist behaviour