changed name & fixed bug