before hacky code, just added controllers