Updated code and added fire return interval