updated status from tha commit caf76c0