Added goSoon and actually works