Try to line up upload
Everything cleaned up