more changes, 7aga te2ref :D