Reapplied Kassy's Changes