Started reworking scanSub() flow