with Justin's fixes