change logic to not require arguments