Applied improvements suggested