added justin's changes