Improved version, cleand up, using highstocks