some amendments, introducing new bugs