fixes now working