Added horizontal tip check (not completely)