28 - rewrite

better logical control, but i misunderstood one of the expectations.