Updated script, making it more usable