Added in waiting function, now to prettify