Commit before TS 9.1 changes
Added preload, refactoring popover