Fixed Overlap

Checking height AND width now... go figure.
Added Analog

Haven't updated in a while. Added Analog version as well