Asma's code integrated