Chnaged interface + one bug