first version - fix some wrong stuff