Remove all static x') and add more stuff