add a new implementation of when back in
Release 2.0.0