Intermidiate commit. Works but filtering issues is too hard