i will apply this as i push the code