Standardise and drawing fixed