Added License and resorted methods to match different "phases"