reverting some hacks to see if it worked originally