Initial rebase
Changed internal parameters to statics