Modify for embed in an application