Removing ; for better compatibility; implementing Evans additions