reformatting, removing one queen
Some major chnages, needs to be tested