Semantical changes for clairity