Attempt 1 at fixing image capture
Commiting merge