all working, need propably improve in Agenda section