Latest commit 2cbad93 @uroboro Reduced logic to single method