Testing updated functions