adding proper worning system