Add Controller again but still needs to be fixed