fixed script and imports