Jeno's changes 12-17-2014