Small logic changes, timo may revert