bugs edited for everything but 7