This line should not be removed... as this logic is still desiderable