Made the code reverse/forward engineering more accurate