#33 modified DB script