Bringing back some changes that got lost