As i promised changing class signature again!!