improvements w/ frp