Removed Tabs, added check on connection