Made more modifications again