Added HD version and fixed bugs