reverting back to older version due to bugs