Add reset of payload
reworking