kinda working
tweaks