Finished Add bug