Added better everything handling