trying to fix instant deconnect of green line problem
merge