yet AGAIN I had to remake this