Extend functionality, updated UI