added scripta from master