Storks: Better than expected

Better than expected, but still needs improvement