commited to merge final version