Made too many changes. need debug