There are bug that im trying to fix