updated class head
improved language processing