Updated, non bundle version