Issues 3 and 6 added