Code is even nicer! (more folds!!)