API update, work on logic