Did some modification because of changes in the heart framework