/// commit 6.0

Signed-off-by: mrfriedfish <nectherlouie@gmail.com>