Updated version moved to utility file