Added Fire Button support and code Cleanup