Changes after code mash #1