I have changed it a bit