Versions upped and cleaned
Don't use highlight