hacked around database issues for now.