All the changes are done and pushed.
This is final code. All the components were working properly as per my understanding.