added something for six, but it sucks.....