Adding "current saved status" to feature/bolt2