Updated for internal needs