Update with Better screen shot option