Updated to comply with merged changes.