fixed bug, added names