Massive chnages as it will work with some errors for the tab