switching back to old GA entity managed by @frsyuki