other commit with major changes