changes for dev6