this was more readable before