added Gabriel's hwrk