Reverted to simpler version.