add A6 and clean up schedule