Emitter now also dependent on beam angle