Improving the functionality