some optimizing on Manager