now fully working, without any fancy things