Added my static changes to the real version