Simplified implementation.

Signed-off-by: FrankHB <frankhb1989@gmail.com>