reworking whisker logic