more refactor - ie8 support code added.