readded some stuff that lex deleted