Switching over to my own scripts