Done lot of changes, finally got all bot working