[#12] Requested changes