first implementation fixes