Some changes to clarify functionality