Finalized again

Hmm, not everything uploaded