Added some intersection logic