Updated fab script