16:9 version + improvements