Major updates - Thanks @magnars!