some changes and parsin