A revised version, did with some 'handtest'