Munjeni's changes