Updated, new, sexy code!

Actually I forgot what changes this has.