Added some changes. Still has bus