Added functionality
Minor changes