updating to latest revision from lionheart