working on bugs -KL