Made soem big changes