Added change to application_controller based on sarken's testing