modified for cleverbug use