Updates and manual formatting