Returning to previous system with a couple of changes