some basic changes in entities