Implement suicide + Some othe improvememnt