fixed bug and name changed