lines 408 + 409 added