added to my previous code