final changes I guess