Added commands & finished listener