Attempted fix of issues 1 and 10