Some work on version 7+