Updated all functions