#363 changes according to comments