Work in progress... version 7.1