some fix first prototype