Adding bagheera 0.7