clean up this script and use new features