more work and added screenshot