CHANGES FOR SLIM CODE