added refresh and message on completion