added more database calls