Initial version.
Adapted to Module 7