Update handler.cpp