Revamp the script