dev
simplified everything