moved from personal devel code