workign on bugs