Added orientation filter and edge cases, but cant get comm to work so unable to test