Updated with Crosswalk Compatibility