Updated Piotr Wielgolaski's contributions