Reformatted
Plot can now check Y location and listeners have been updated accordingly.