Update based on conversation with @laszlopandy