Implementation - Some changes