itemize the changes and use more portable flags