updated, fixed bug