Slightly better, could possibly work if I figure out proGuard. ~I have no idea what I'm doing~