New api based on feedback