fixes NOT READY FOR BUILD