Updated code commit on 9/21