Somehow.. git or diff things I've changed this all