Even simpler code