First Batch of changes