Hopefully (fingers crossed) all formatting is better