Added and updated functions