Clone of viijava with some patches