issue 2 for final merge