Updates by Lipp