Major changes from odme private