Made Justin's changes