let me know if I have to change anything