still not working, revert to old code for now