New changes to improve functionality