updated with previous chages

^^