WIP: improving behaviors