updated. fixed bug