Changes done for do not edit and etc