re-did this right somehow -hehehe was here