More changes to be included in alpha7