commit current working 17-02-14