6.5p1
simplify and actually make it work