modified for new rp devel....