Krista's changes to image stuff