udpated to ignore smokebox