Adjusted for multi-platform support