HOTFIX- ignored some important stuff