some tweaks but still not working