Removed dependence on old data routines