add filter hook and other