Added number 6 and fixed bugs