api rebuilt a bit