Updated stuff all around