Moved  shameful logic from the shame.api solution to the shame solution