Done with static changes