Added and updated stuff