After complete rape of the earlier code