changed this a lot