Pre-final batch of changes