Added some more scripts and calculations