modified for our ui