Removed hardcoded shell, using logon instead