Amends as suggested from Luke.