Small function updates