now fix me