added 'wait message'feature