Updated to reflect changes made to v7