back to a working version - about to add commit