merge in supervisor screen + other