added the flee, and changes to support it from class