add kristian, update joel's entry