Updates in script, needs cleanup