adjusted emergency switch to work, for now