Tidied and fixed primer