all is working but need a check