some changes in megatrash commit