stable the prototype version with bugs fixes