updates - initial working version