Major improvements to interface