Issue N 1

Issue N 2