working on updating core controller
working on updating core controller