Updated functions for updated file