got last one to work again but buggy