added tools. updated model