preparing for interal api