changed it accordingly