Tidied up, minimised the addon right down