Revised MainActivity to only use one client