Made it JS friendly