Develop

Making the script more complete.