updated to conform to 5.2 convention