More Changes with 1st DB script