more changes LOL