Bugs fixed
Temporary advanced edition