fixed for A1 project