adjusted work again, added form