Changed to use Application instead of OS.