moving over original ghunit work