i changed some things but not that much