Updated after feedback