Probably needs retiming... Sorry, whoever verifies this...

mod note: retimed