add mark and angel 30 stuff