Last fix by me..I think this is the final version