fixing handler, finished integration