re-do previous commit with less variables