last bugs fixed
new architecture