trying to move it all to the script