what we have now, still not working as intended