Made more semantic.