fixed teh hack and enclosed scripts