Profile handler rewrite, faster