Some changes in prototype