Commit by Kim at 10:48am 05.21.14