Alarm WIP3 with some changes + unused code remov.