Added logic for better following