Added work with conytroller
Added change to entities