Small Changes - waiting to add a scheduler!!