Updated API#2