current fixed
private fields added