Updated done method