changes to go around ssh confirm and save time