update w/ sam k's changes