Many Under the hood changes