Added better logic into setup