updated with empty db stuff, and to work with amazon RDS