Issues 1 & 2 solved