Major Fixes v2.5.2