addressed all the warnings