removed violations and added 30 and 31