Updated import, and some application code