still trying to fix bugs