Using logon instead of hard-coded shell