Updated stuff and something actually works