[Modified] a bit solved problem no. 1