More initial changes to scale down the project