You're right, will implement this.