attempt at tweaking variables and logic, largely failed