Fixed update and api functions