trick model
cleanup
angular added