took care of warnings