working stuff updated