updated to remove simulation related stuff