Rebuilt for web and mac