Maciek's additions