here i did a lot of changes because..
and this might now work better
lol D: