modified for db & config changes