Last changes, now fully working