previous commit was lazy, this should be less lazy lol