Update code for most recent changes