finish first version of issues