fixed typo + using everything in script to make it less complicated