Trying to adapt the push message