updated with latest lanyon updates