We have to disable, will work on making them invisible too