reduced number of warnings