workin on the bug