few changes because phantomJS