stuck, small changes