new update after merging and from nnew computer and in working condition