cleaned up cat-code; to-be-remedied = photo problem