Collimation part 2

Published --