Improved native system. I don't know why git is being all weird...