[COMPLETED] Entity Chamber maintenance