Fixed Issues 1 & 3