changes to suit internal needs