Changed many things very slightly