Version 3 - added code coverage