Making the branch ready for Slim