Added new wait method