adam added more tasks and isr stuff