fixed, but trying to make cleaner