Adding some updates to functions