more changes to hehehe