[#9][#13] Requested changes