converted to less
fixed test
fix null bug