merging with the final flex version of the program
updated across repos