working out bugs -vinod