another commit from stay connect