Reworked after remarks