Code refactorization
G5.listen fix
G5.listen fix-2