Apply commentation from @philfreo