Resolve issue 16 & 29