Jawwad style changes