Adding in stopping, @-mentions