(Done)  removing code for debug