Continuing support for multi-platform (part 2)