more tweaks not working just yet