Re-added original, heavily alter new