Updated to support chrome