Updated for issue 2