Stage 2.3

Minor changes