Cleaned up and enriched version of Man