new way of handling restart