last changes :) READY TO DEMO