get Justin's changes