Updated to general convention