/mo take, & bug fixing