More Andor modes implemented