[#16] made more changes