Added retry? functionality