Major changes

Need to be tested