little changes to account for multiple switches in one room