EMC-Stock + additional changes