more changes... finally kinda working\!