working on clientside correction