Revamped the interface