Forgot some extra modifications with static