Changes after Jer fixed script