Added bus and improved simulation mode