Modified to work on M1 agenda