added some hax